Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Mon, 14 Nov 2005 11:12:29 +0000 (12:12 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Mon, 14 Nov 2005 11:12:29 +0000 (12:12 +0100)

Trivial merge